From 6f872f56c3c13d9d7eeb97f8f7344858a907b26f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 14 Nov 2014 14:52:22 -0800 Subject: [PATCH] Update curl-rust to fix SSL on windows Closes #873 --- Cargo.lock | 14 +++++++------- Cargo.toml | 3 +-- src/registry/Cargo.toml | 3 +-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ca879900..b48ba2225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,7 +2,7 @@ name = "cargo" version = "0.0.1-pre" dependencies = [ - "curl 0.0.1 (git+https://github.com/alexcrichton/curl-rust?ref=build-cmd)", + "curl 0.1.0 (git+https://github.com/carllerche/curl-rust)", "docopt 0.6.8 (git+https://github.com/docopt/docopt.rs)", "flate2 0.0.1 (git+https://github.com/alexcrichton/flate2-rs)", "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs)", @@ -17,17 +17,17 @@ dependencies = [ [[package]] name = "curl" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=build-cmd#c7a6c5123c67abc22c3b3517579974782a9dd273" +version = "0.1.0" +source = "git+https://github.com/carllerche/curl-rust#dbd06414ba879572faae75bfd0320a38fbbc3518" dependencies = [ - "curl-sys 0.0.1 (git+https://github.com/alexcrichton/curl-rust?ref=build-cmd)", + "curl-sys 0.1.0 (git+https://github.com/carllerche/curl-rust)", "url 0.1.0 (git+https://github.com/servo/rust-url)", ] [[package]] name = "curl-sys" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=build-cmd#c7a6c5123c67abc22c3b3517579974782a9dd273" +version = "0.1.0" +source = "git+https://github.com/carllerche/curl-rust#dbd06414ba879572faae75bfd0320a38fbbc3518" dependencies = [ "libz-sys 0.0.1 (git+https://github.com/alexcrichton/libz-sys)", "openssl-sys 0.0.1 (git+https://github.com/alexcrichton/openssl-sys)", @@ -161,7 +161,7 @@ source = "git+https://github.com/alexcrichton/pkg-config-rs#d24a08d87d63df8dc952 name = "registry" version = "0.0.1-pre" dependencies = [ - "curl 0.0.1 (git+https://github.com/alexcrichton/curl-rust?ref=build-cmd)", + "curl 0.1.0 (git+https://github.com/carllerche/curl-rust)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2832bf782..b3f3f7a98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,7 @@ git = "https://github.com/servo/rust-url" git = "https://github.com/rust-lang/semver" [dependencies.curl] -git = "https://github.com/alexcrichton/curl-rust" -branch = "build-cmd" +git = "https://github.com/carllerche/curl-rust" [dependencies.tar] git = "https://github.com/alexcrichton/tar-rs" diff --git a/src/registry/Cargo.toml b/src/registry/Cargo.toml index 3a7755ecd..1ad5cb723 100644 --- a/src/registry/Cargo.toml +++ b/src/registry/Cargo.toml @@ -8,5 +8,4 @@ name = "registry" path = "lib.rs" [dependencies.curl] -git = "https://github.com/alexcrichton/curl-rust" -branch = "build-cmd" +git = "https://github.com/carllerche/curl-rust" -- 2.30.2